ioemu stubdom: make TPM optional

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index ebd691b5f09934ff84b972f3531e862e9394cb33..2b1bc6bb132c741bda325f0fb96358a81b76b4ed 100644 (file)
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -420,6 +420,7 @@ VL_OBJS+= xen_machine_pv.o
 VL_OBJS+= xenfb.o
 VL_OBJS+= xen_console.o
 VL_OBJS+= tpm_tis.o
+CPPFLAGS += -DHAS_TPM
 CPPFLAGS += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)

diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c
index 5d982016a6cb477a52a9f3b5a5f1d0ce279257f3..430d932942739afb8c2f5fa2ff2be00370ed46a9 100644 (file)
--- a/tools/ioemu/hw/pc.c
+++ b/tools/ioemu/hw/pc.c
@@ -1013,8 +1013,10 @@ static void pc_init1(uint64_t ram_size, int vga_ram_size, char *boot_device,
         }
     }
 
+#ifdef HAS_TPM
     if (has_tpm_device())
         tpm_tis_init(&pic_set_irq_new, isa_pic, 11);
+#endif
 
     kbd_init();
     DMA_init(0);